GtkCssProvider: don't segfault when CSS file is not found

 * Fix null dereference in gtk_css_provider_take_error()
 * And another in gtk_css_provider_emit_error()

https://bugzilla.gnome.org/show_bug.cgi?id=664537

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 1b993ec9fd521907353fec563cc44ed052ca0c9b..1ac52bc533c4db90f5a49457ba3c52f7f4d469e4 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1230,7 +1230,7 @@ gtk_css_provider_emit_error (GtkCssProvider *provider,
                              const GError   *error)
 {
   g_signal_emit (provider, css_provider_signals[PARSING_ERROR], 0,
-                 scanner->section, error);
+                 scanner != NULL ? scanner->section : NULL, error);
 }
 
 static void
@@ -1542,7 +1542,7 @@ gtk_css_provider_take_error (GtkCssProvider *provider,
                              GtkCssScanner  *scanner,
                              GError         *error)
 {
-  gtk_css_provider_emit_error (scanner->provider,
+  gtk_css_provider_emit_error (provider,
                                scanner,
                                error);